(calculate-c++-indent): Respect

c-continued-brace-offset (as in c-mode.el).

diff --git a/lisp/progmodes/cplus-md.el b/lisp/progmodes/cplus-md.el
index 8548c3826e56bee8cdf7a5e58108229ba1a9f953..b2e6d102a2477363d208d3a3f95c2ec0da35773f 100644 (file)
--- a/lisp/progmodes/cplus-md.el
+++ b/lisp/progmodes/cplus-md.el
@@ -515,7 +515,11 @@ Returns nil if line starts inside a string, t if in a comment."
                 ;; previous line of the statement.
                 (progn
                   (c-backward-to-start-of-continued-exp containing-sexp)
-                  (+ c-continued-statement-offset (current-column)))
+                  (+ c-continued-statement-offset (current-column)
+                      (if (save-excursion (goto-char indent-point)
+                                         (skip-chars-forward " \t")
+                                         (eq (following-char) ?{))
+                         c-continued-brace-offset 0)))
               ;; This line starts a new statement.
               ;; Position following last unclosed open.
               (goto-char containing-sexp)